merge emacs-23
authorKenichi Handa <handa@m17n.org>
Sun, 2 Jan 2011 07:27:55 +0000 (16:27 +0900)
committerKenichi Handa <handa@m17n.org>
Sun, 2 Jan 2011 07:27:55 +0000 (16:27 +0900)

Trivial merge